Revert "kern: Make grub_error() more verbose"

This reverts commit 75a20cc1449b8b5176b8d93189a2d559a5415ad6.

Gbp-Pq: Topic upstream
Gbp-Pq: Name Revert-kern-Make-grub_error-more-verbose.patch

diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
index aebfe0cf8394f6a5061af84a7d3ab02452294703..53c734de70e583eddd97fb1dc41334c4ab6c00cc 100644 (file)
--- a/grub-core/kern/err.c
+++ b/grub-core/kern/err.c
@@ -33,24 +33,15 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE];
 static int grub_error_stack_pos;
 static int grub_error_stack_assert;
 
-#ifdef grub_error
-#undef grub_error
-#endif
-
 grub_err_t
-grub_error (grub_err_t n, const char *file, const int line, const char *fmt, ...)
+grub_error (grub_err_t n, const char *fmt, ...)
 {
   va_list ap;
-  int m;
 
   grub_errno = n;
 
-  m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, line);
-  if (m < 0)
-    m = 0;
-
   va_start (ap, fmt);
-  grub_vsnprintf (grub_errmsg + m, sizeof (grub_errmsg) - m, _(fmt), ap);
+  grub_vsnprintf (grub_errmsg, sizeof (grub_errmsg), _(fmt), ap);
   va_end (ap);
 
   return n;

diff --git a/include/grub/err.h b/include/grub/err.h
index 4b02d136a7b1785202efd35d0da81a14fb01e743..6ab905c937aef0ea8bd44110da00ceede0052c63 100644 (file)
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@ -89,11 +89,8 @@ struct grub_error_saved
 extern grub_err_t EXPORT_VAR(grub_errno);
 extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG];
 
-grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const int line, const char *fmt, ...)
-       __attribute__ ((format (GNU_PRINTF, 4, 5)));
-
-#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
-
+grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *fmt, ...)
+    __attribute__ ((format (GNU_PRINTF, 2, 3)));
 void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_error_push) (void);
 int EXPORT_FUNC(grub_error_pop) (void);